2d0cd430eb3c880345305a5e57a3d235b8cb339b,core/JavaLineArray/src/main/java/JavaTacticalRenderer/Modifier2.java,Modifier2,areasWithTwoLabels,#TGLight#String#String#Graphics2D#,1803
Before Change
}
}
//if we don't have at least 2 valid segments for both the label and the ENY then return false
if (sumLabel < 2 || sumENY < 2) {
return false;
}
//at this point we have valid pixels for alternating labels, i.e. at least one of each will appear
for (j = 0; j < tg.Pixels.size() - 1; j++) {
if (eny.isEmpty()) {
last = eny;
}
pt0 = tg.Pixels.get(j);
pt1 = tg.Pixels.get(j + 1);
dist = lineutility.CalcDistanceDouble(pt0, pt1);
if (dist > 1.5 * labelLength && last.equalsIgnoreCase(eny)) {
//add the label
AddIntegralAreaModifier(tg, label, aboveMiddle, 0, pt0, pt1, true);
last = label;
} else if (dist > 1.5 * enyLength && last.equalsIgnoreCase(label)) {
//add the eny
AddIntegralAreaModifier(tg, eny, aboveMiddle, 0, pt0, pt1, true);
last = eny;
}
}
After Change
for (j = 0; j < tg.Pixels.size() - 1; j++) {
if(eny.isEmpty() && last.equalsIgnoreCase(label))
last=eny;
if(label.isEmpty() && last.equalsIgnoreCase(eny))
last=label;
pt0 = tg.Pixels.get(j);
pt1 = tg.Pixels.get(j + 1);
dist = lineutility.CalcDistanceDouble(pt0, pt1);
if (dist > 1.5 * labelLength && last.equalsIgnoreCase(eny)) {
last = label;
sumLabel++;
} else if (dist > 1.5 * enyLength && last.equalsIgnoreCase(label)) {
sumENY++;
last = eny;
}
}
if (eny.isEmpty()) {
if (sumENY < 2) {
sumENY = 2;
}
}
if (sumLabel + sumENY < 4) {
return false;
}
//at this point we have valid pixels for alternating labels, i.e. at least one of each will appear
last=eny;
for (j = 0; j < tg.Pixels.size() - 1; j++) {
if(eny.isEmpty() && last.equalsIgnoreCase(label))
last=eny;
if(label.isEmpty() && last.equalsIgnoreCase(eny))
last=label;
pt0 = tg.Pixels.get(j);
pt1 = tg.Pixels.get(j + 1);
dist = lineutility.CalcDistanceDouble(pt0, pt1);
if (dist > 1.5 * labelLength && last.equalsIgnoreCase(eny)) {
//add the label
if(!label.isEmpty())
AddIntegralAreaModifier(tg, label, aboveMiddle, 0, pt0, pt1, true);
last = label;
} else if (dist > 1.5 * enyLength && last.equalsIgnoreCase(label)) {
//add the eny
if(!eny.isEmpty())
AddIntegralAreaModifier(tg, eny, aboveMiddle, 0, pt0, pt1, true);
last = eny;
}
}